cleaning up everything and fixing up comp logic