updating things to be slightly better and working