Regex fix, Other minor edits

Version Pre-Alpha 0.6.9