fixes multiple issues stated in the issues/suggestions area