lock on initial data model
moved to 32bit floats and ints
updated TODOs