corrected behaviors bugs