khoms and some bugs fixed !