Fixed the first bug!!