Cosmetic changes and code in place for rioting when unhappy
Added notes and cleaned up