Update

Adding and tweaking previous features.