Fixed some really Important stuff!