Trying to fix bug

also added some stuff