fixes according to feedback