FPU work, bug fixes
merging