various changes, main re-labelling and hiding things, as per client request