A few bugs fixed!