Fixed one bug.... sorta (it's good enough)