finally pushing...bug fixes and such

ready to port to django...