Fixed eudation mistakes, renamed variables