multiple fixes
countless little fixes