Started fix on some stuff.
small update
small update