Started testing parameters, fixing stuff