Fix my bugs now

still buggy