finally fixed everythign
removed junk