Commit with Magnus Bar and some fixes