More changes, removed lcd-stuff and changed other things to reflect 2 batteries