Small additions + bug fixes