last round of feature requests; fixed some bugz; UI enhancements