Small bugfixes and names fixing.