a
minor bug fixes; more to go