fixed another import
Added some comments and reformatting and todos