Bug fixes
Bug fixing

Along with the previous update, tickets 51, 21, 30, 49, 52, 53, 31, 11,
40, 50 were resolved.