Javascript cleanup, getting rid of errors, optimizing selectors and stuff props @nb