optimizations and bug fixes
bug fixes, new collections, UI fixes