Added Mr Sim's latest code and updated Comments and Objects for better inclusion for additional objects.