some fixes for the first release