Fixed almost everything