Adding some stuff.
Fixed stuff