cleaned up things and made sure they work