updated to near pre-alpha launch
clean up merge