minor changes
Manual merge
moved general Drive behavior
removed general Drive behavior from maze package