Many design improvements