some tidying... still not ready for primetime though