Working on fixing some bugs

Will be up soon