Finishing touches and working with modules