final bug fixes, some commenting