Not working yet, but fixed couple wrong things