a little bit of cleanup, alot more really needed, and some fixing, getting some saving/loading functionality working