Fixed bug in event handling
Fixed merge
Disabled acceleration-level computations and variable step integration