fixing import errors if using cloned repository, also fixing issue 22 and issue 23 (i hope)