everything is done, just need to fix some minor arrow problems