More functionality, more fixes