Update 04/04 11:35 by K

- Fix some bugs