added more features, UI touchups