some more improvements, statuses are shown ok