Cleaned up a few things

Should be ready to put online soon, need to change at least 3 lines of
code though (3, 116, 117 in fetcher.js to show live data)