cleaned up some design and date stuff