updated to latest version
cleanup and other stuff