a lot of things cleaned up and new syntax for the Olivefile! :D