Improved exercise form, bugfixes