Reduced the number of reRenders needed.
Handled some warnings and stuff.