Added cosmetic changes and fixed some stuff