fixed some bugs like camel shit