Added comments for fixes