cleaned up logs, did some code cleanup, and changed the appearance on a few things
fixed merge conflict on main.min.js