Fixed the bugs :bug: