Some bugfixes
Various updates #2