Small fixes, further progress on designs