some more changes (thanks to @AgentREV)

some more changes (thanks to @AgentREV)