Some improvements.
Added html & coffe improvements.