fixing some stuff
Fixed some issues.