Started making minor fixes