clean up to pass specs
squash bugs from user acceptance tests