fixing things slowly... while geting distracted