Fixed Joe's bugs

Everything is hopefully fixed