Text adjustments
Marking obligatory fields as such
Better error handling + bug fixes