Bugfixes. Added commit.