fix

Fixed some small issues and illogical stuff