misc fixes and remove default content