Bug fixes, nothing major, just making everything work from last release