Some testing and small changes