cleaned up
fixed shit too