small tweaks
Working on percentage bug
remove percentages for now