Useless tweaks and refactoring. Going to test specexec now... #115