fixed most of albertos edits