Updated build, Tinkered with old files