Made some final touches