graham Bugfixes and updates implemented please check it out