added back in odds features
fixed bugs in form calculation