Misc
Update atom-forge.h
Misc fixing
Handle int scalepoints better
Misc
Cleanup
Misc fixing, cleanup