changing static calls to object calls
fixed more static to non static methods except the one marco messed up