moved stuff
added more patches