bug fixes towards the online status