Frontend additions and backend fixes