Various fixes, cleanup, check with regex, a new method to check status