fixing everything

updating master