final touches.... well, hopefully final