touch ups; ready for beta testing