Resolved some symlink dictionary errors, cleaned up some code for 0.3.7.