Added autodrive and some fixes