Couple of bugfixes and user design improvements