Cleanup minor bug, package ready for Alpha version to public.