Added a couple of basic funtionality features