fix to detect n900 battery; add support to built in battery variables to work with...