Added import for the repositories, and fixed some small things.