bugfixes due to merge

Really think this is better? Might be quicker, but don't think we're need to worry about that here