Usage update and minor bugfixes