Update #11

Bug fixes, new things, etc.