Updated a few bugs