added my fixes