multi-layered fixes

Look up this word on Fala2Me