A bunch of updates and som new functionality
Big update to lots of files