some unwanted and unimportant bugs fixed