Issues Fixed

See Tadasu85 issues log for all issues resolved here.