Getting ready for api docs... <br />fix minor bugs.