Cleanup code, add GA support, ready for distribution