Fixed imports and some small changes