fixed password issue, rearranged blocks, python3 updates,