Minor fixes, method name changes to align with README