huge battery rework, removed mdpi stuff