Fixes

Made more fixing and adjustments