fix: issues on master
fix: issues in master logic
fix: some stuff
fix: logic fixes master state
feat: add master top entity