finishing touches... almost perfect... functional