Updated files, very nice improvements