Fixed issue where disable button logic was broke, added more comments