FINISHING TOUCHES

READY FOR COMPILE FOR ALPHA