Changed a few things, corrected errors