Error fix (unfinished)

Also from class