final few changes -- it looks horrible!! but it's alright I suppose