fixed some indent, changed some variables