fixes, design improvements