bug fixes and decorator creation