Fix bugs, now works again.. doh