Clean up of code and added some stuff