Fixed stuff in API
commiting merge fix
fixing merge