API cleaning
API cleaning
added todos
API cleaning
misc cleaning
small API changes