Fixes, more comments