- Finishing some features