console && bugs fixed