Small Fixes, ready for final release