ready for test deployment
fixing some issues for deployment...
after deployment clean up