Fix quantity conversion
Fix motor imports