final fixes, almost ready for a full release