made some improvements, took out some code...