more cleaning up, and this version is ready