Final updates + bug fixes

Everything works now.