added some features (forgot when I last pushed), and added qmark