fixed stuff until kris breaks it again