general improvments all around.