final touches before leaving on friday. still --kind to implement among other stuff