Madea few more edits, need to test them later