Update

Some fixes, some new content.