done fixes according to request comments