Codex: Space Marines

Few bugfixes.