Slight tweaks and api enhancements