fixed scaling and validation issues