final fixes. ready for alpha release