Small fixes

Added commentary