Updated Everything

Everything is working after multiple recommits. Silly ubuntu.