added names, fixed someting