Updated a few bugs
Updated