SwiftJSON added, bug fixes