updated stuff, might switch to fish