Major functionality/fixes added