Final changes, won't be updated anymore as the project was turned in. May update in the future when I have more time and motivation