Fixed bugs + energy bar work