cleanup, added import bar and functionality