Minor updates. Still not working right.