Fixed a few warnings
Removed an unused import
fixed a few varible mistakes