Streamlined & fixed bugs