Minor fixes

Minor fixes/changes to make things more clear