some odd stuff

lets merge 'some odd stuff' to 'master'