All cleaned up. Ready to use, if there are somme errors let me know