Skip to content

first round of fixes #627

first round of fixes

first round of fixes #627