Fixed imports and made a few changes