small bug fix (loading initial message) and clean up