Updates
Add some helper functions
Add new prompt
Other small fixes