cleaned up code and made some selectors global
made id's consistent, cleaned up console