LOOAADS of changes, will be fixin!

sorry everybody!