Fixing behavior processing

This adds services to the enhanced behaviour. Plus it fixes several issues with the general behaviour