Final Fixes #66