Cleaned-up linker file, and fixed a bug.