Develop

Various issues resolved.