More features

developed on gh-pages by accident