Minor fixes and reverted Recent Console Code

Console code broke, reverted to older version.