Some fixes, some logs and better organization for comp props form