Fixes, more API features