After many months, commiting a few minor changes