Some changes to printed parts, better organized main assembly