fixes bugs, last edits