Changed movement engine; bug fixes