Fixed minor bugs
Cosmetic additions