Changed: bug fixed, minor changes for comfortable