minor bug fixes, still not working as designed
minor bug fixes, still not working as designed

mlilback/rc2SwiftClient,mlilback/rc2SwiftClient,mlilback/rc2SwiftClient,mlilback/rc2SwiftClient,mlilback/rc2SwiftClient,mlilback/rc2SwiftClient