Completed

- 91 for Nanaloab fix two buggs :)