Few updates that I feel useful for a good base