Rename file. Little bugfixes.