Some more updates - little bit of everything