BugFixes/Live testing

fixed bugs based on live testing