Housekeeping and updated API docs