added serializable
updated serializable
removed stuff, fixed stuff
added fixes for imports