Precalc fixes

Precalculus bugfixes from https://docs.google.com/spreadsheet/ccc?key=0Av8IayOVUCSXdE9wLUR3WWZyV2F3Q3JyZ0NESUFjZnc&usp=drive_web#gid=0