Minor api fixes
Add stuff
Final tweaks