:whale: made some fixes here and there