Remove offsets and add basic logging of commands