Fixed W3 Errors, Cleaned Up Code.