Fixed bugs with everything