Freeze Code before Acceptance

All bugs fixed
Ready for deployment