updated several files with 1.7 changes (admin) and also cleaned a lot of commented out code