added MAXPOWER to Equipment and generally improved functionality of
methods