design and logic fixes