Massive update, still lots of bugs