#broken Made some changed

The whole thing is now a little bit broken. Requires fixin'