Cleaning & small fixes