Update and minor bug-fixes