Various fixes, to lower case, rearranging capturing process