i decided to fix some things in here