fixed some wrapping issues