Minor changes and bug issues resolved.'