fixes just to get it going!!!