FIXED: some minior issues