Final .54 version for release

Fixed a few unreleased bugs that caught in testing.