Almost everything fixed