big fixes and more bugs created