Finished fixing errors. Still not done with arranging though