Cleanup
Fixed lots of issues with pie