Removed or reworked various stuff and fixed capes.