Fixed stuff to get it going