fixed #295. fixed imports and jalopy