real & current adjustments for demo
fully implemented adjustments and some other small fixes