Codestyle and some small logic fixes in previous pull request
Implement changing of the `id` field, which is now finally possible after the last pull request!