more API changes
minor cleanup