Updated version

Minor bug fixes