moved stuff, and some updates