kakimari-some new stuff that was totally rushed and I will fix later