Prototype rename, fixes, comments