commiting some outstanding bug fixes...