Fixed some bugs
Working na ba to?