Added limits on character frame bounds
Fixed conflicts on merge