Final

Bug fixes
Finalize for initial release