bug fixes + js overhaul