added a few little improvements