minor changes... getting really tired of this project