Quick cleanup & turning in 00-05