Version 5 - 1, bug fixes