Lots of updates from uni pc
A small bug due to rename of files in previous commit