Fixed some stuff to make it work online