Various updates

Some parts are broken.