fixes, design