Fixed some problemos