Added More Object Types
Fixed Some Warnings