added extra params
save last call for improve testing
proper cleanup when layer is removed
multiple fixes
missing test
fixes