mid-week commit

changes and more changes, few bugs, not finished