Added some new small updates including funtainer