repo cleanup, cleaned up the wrappers, fixed return values