Added background. Fixed some minor bugs