testing and making minor bug fixes