cleanup and about fixes