Fixed conflicts.
Changed way rotation speed was derived.
Cleaned class constructor, removed unneeded includes.