Bugfix, updates to reflect latest source.