General updates and fixing of spacing