more changes to fix stuffs