More work done on singular forms and preprocessing
little tiny fix